Don't override user-changes if the record changes in the background

Change-Id: I565a6dd6de2cf43ae97c27606fab709113873cc9
1 file changed