Merge "Add DREAMING->LOCKSCREEN to model" into main