Merge "Exit dream within keyguard-going-away transition" into main