Merge "Move flag from systemui to frameworks" into main