Merge "Update mHavePendingChanges when there are changes"