Merge "Update QS header to handle 320dp without overlapping" into nyc-dev