Fixed formatBlock buttons being not highlighted in the toolbar
Merge branch 'formatBlock-fix' into image-upload