Merge "[DO NOT MERGE] Coordinated DREAMING->LOCKSCREEN animation"