Merge in FontSizeControl
Merge cleanup
wip on StyleEditor typescript and tests