Merge "Merge "Take screen-off animation into account when determining hiding nav bar" into sc-dev am: 6574585d am: cd14d4c3" into sc-v2-dev-plus-aosp