Merge "Groundwork for runtime-toggleable feature flags" into ub-launcher3-master