Merge "Removing dependency on LauncherActivityInfoCompatV16" into ub-launcher3-master