Merge "Narrow down the condition of wallpaper target for occluded keyguard" into 24D1-dev