Merge "Fix bug #7651552 resetRtlProperties() is called way too often" into jb-mr1.1-dev