Update for mobile push notification settings
Merge branch 'master' into mobile-push-settings
Merge branch 'master' into mobile-push-settings
Merge branch 'mobile-push-settings'