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

* commit 'd637903fe683bd4cf7403ee69e3d59e55e382c29':
  Update QS header to handle 320dp without overlapping

Change-Id: I1fe29681d00767a60e017ba5fc0993b981718a7a