Merge "Fix wallpaper window multi-touch"