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

Change-Id: Id25e259915ea0e8c9bbc6676b5b9d6fbc56cd9f6