Merge "Use CoreSettingsObserver for accessing text flags" into main