Merge "Remove flag check on DREAMING->LOCKSCREEN" into main