Merge "Fix race condition in DREAM->LOCKSCREEN transition" into main