Merge "DataSettingsManager broadcast initial state and add init check"