Merge "Visual changes to QS header" into qt-dev
am: e19335a443

Change-Id: I06d65d79063268e3ee529864eec15acd0b473c54