Merge "Fix issue #7585876: When changing the font settings, the movie..." into jb-mr1.1-dev