Merge "Removing left over experimental overlays and frame width (2/2)" into ub-launcher3-master