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

Change-Id: I39ba77edf0cf4221e979ea538475a87399ab29d5