Merge "Start ControlsControllerImpl on the correct user" into rvc-dev am: e84b9d747b am: a3c6514e3f

Change-Id: Ie62d7e35304efd0236fbe7050e9829f0c50fb05b