Merge "Settings: App notification settings updates."