Merge "Keeing the device in gesture nav while user setup is pending" into rvc-dev am: 9bc5f9ef am: aabda844 Change-Id: I9fc0d4c155c5c9da7e3822b52294a28cb02edc95