Merge "Change UndoManager mOwners from HashMap to ArrayMap"