Merge "Updating the scrim and landscpae ui" into ub-launcher3-master