Merge "Add SideFpsProgressBar to show a progress bar when rest_to_unlock feature is enabled" into main
