Merge "Fix a couple of rendering issues Bug #7253839" into jb-mr1-dev