Merge "Remove relayouts b/29945805" into ub-launcher3-calgary