Merge "Use onPreEntryUpdated instead of onPostEntryUpdated"