Merge "[RESTRICT AUTOMERGE] Move Theme::Entry definition to top of file" into main