Merge "Support flagging for PreferenceScreenCreator" into main