Merge "Don't factor animating-to-sleep for nav bar visibility" into sc-qpr1-dev