Merge "Avoid locking mChanges when not necessary"