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