Merge "Avoid creating DB replication lag in clearAllNotifications()"