Merge "Take screen-off animation into account when determining hiding nav bar" into sc-dev