Merge "Fix some issues with notif blocking in settings"