Merge "Fix large screen QS header" into tm-qpr-dev