Merge "Reorganize notification Settings classes"