Update schemaPlugins
Fix bug that hid remove icon from elements that were added
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x