Merge "Fixing touch feedback clipped on SetWallpaper button" into ub-launcher3-burnaby