Merge "Update json style files with the new 'fontStyle' format." into devel/master