Merge "Make collapsed QS work the same as expanded" into nyc-dev
am: 0934240233

* commit '09342402332826b46cf8181196a8793202104e31':
  Make collapsed QS work the same as expanded

Change-Id: I9193278a1b6c39ab632ca741e7ef2971e5555e0d