Merge "Fix flash of QQS when collapsing in Keyguard" into main