Merge "Fix RTL in QS Header Info" into qt-dev
am: 769dd9f0e3

Change-Id: I0607a0c56a1034ed2b38097d6f5353a1e5346972