Merge "Correct keyguard occluding condition for wakeup" into main