Merge "Tiles added through adb stay during edit"