Merge "Merge "Take screen-off animation into account when determining hiding nav bar" into sc-dev am: 6574585d am: 91d54356 am: 62ba2f64"