Merge "Consolidate app notification setting prefs" into sc-dev