Merge "Avoid the keyguard being a wallpaper target" into main