Merge "Account for last animated-to-sleep state when calculating nav visibility" into sc-dev