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: aabda844 am: 6d5007eb
Change-Id: Idc905b0b87c982c369c11c304f35d7d6f3951140