Merge "Ensure we update the navigation mode when switching users" into rvc-dev...
Merge "Ensure we update the navigation mode when switching users" into rvc-dev am: 2e0fd15e am: de237eab am: 09295a22
Change-Id: I56b86e23902e8ac03674fc1d18228af230e563a2