Merge "Ensure state is set correctly after animateAppearOnLockscreen is called" into tm-qpr-dev