Merge "Keeing the device in gesture nav while user setup is pending" into...
Merge "Keeing the device in gesture nav while user setup is pending" into rvc-dev am: 9bc5f9ef am: a75e2981 am: 7b08410e am: fd5f75e1
Change-Id: I39fa8c6362bfeeba6722812fad6238062b29e330