Merge changes I241c8b2b,I9ab51f29,I6c231184 into main

* changes:
  Add missing <iterator> include for std::inserter
  Fix std::unique_ptr error with incomplete CommonFeatureGroup
  Move Theme::Entry definition to top of file