Merge "Action for adaptive notif settings" into main