Merge "Make QS header less broken on tablets"