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
Change-Id: Ic15fe3cfe07419b68d192fc20f43043e786d544d