Merge "When wallpaper target is under keyguard, use keyguard" into 24D1-dev