Merge "Effectively remove EDIT_DEFER_UPDATES flag"