Merge "Moving Plugin and feature flags UI to androidX" into ub-launcher3-master