Merge "Don't play an animation for WAKE + KEYGUARD_OCCLUDE" into main