Prior to doing anything in core maybe try 2 things:
-
A data explorer query for this
-
A theme component that adds Matrix
I worry about adding complexity here to core.
Also on core’s side, I think it makes sense to show a list of “themes” that have a component in the actual customize menu for the component. Just need to be careful not to clutter that UI too much.