Merge "When wallpaper target is under keyguard, use keyguard" into main