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

Change-Id: I8a18e54612a6d9bd965e657e1196bb2c15d98a1a