Merge "Merging ScrimView into GradientView" into ub-launcher3-dorval-polish2