Merge "Adding a carent in the scrim" into ub-launcher3-edmonton