Merge "Add Settings.Secure.NAVIGATION_MODE_RESTORE" into udc-qpr-dev