Merge "Moving some more stuff behind the live tile feature flag" into ub-launcher3-master