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

Change-Id: I6dafb82cd6be3d3ba655d4bbd91f589cf3254249