Merge "Don't auto-expand QS from detail panels" into oc-mr1-dev
am: 8b2d853bee

Change-Id: I0f743a26a38b999ed50df67cf12c4d855475b297