Fix merge [3/3] Settings: Notifications settings