Merge "Ensure that we don't additionally crop the launcher surface" into ub-launcher3-master