Merge "Do not let DataUpdate exceptions block other deferred updates"