Merge "Ensure we update the navigation mode when switching users" into rvc-dev