Merge "Fix keyguard on secondary displays" into main