DEV-50233 - Wait until font is loaded in composing
Merge remote-tracking branch 'origin/dev' into dev