Merge "[Fold to AOD] Respect screen off animation status in navbar when keyguard is showing" into tm-dev