Merge "Keeing the device in gesture nav while user setup is pending" into rvc-dev