Merge "Add a DefaultElementContentPicker factory for movable elements" into main