Merge changes from topic "gm_bg"

* changes:
  Fix garage mode ControllerTest
  Re-start background user when starting garage mode