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

Change-Id: I16d4653ed41dac861ef539885b6de649960c3f74