Merge "Not using SIDELOADED_LAUNCHER name" into ub-launcher3-master