Merge "Move shade to the default display when the keyguard is visible" into main