Merge "Use withEndAction for unlocked screen off animation end action." into tm-dev