Merge "Start ControlsControllerImpl on the correct user" into rvc-dev