Merge "Remove SideFpsController" into main