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