Merge "QS: Fix expanding on closing detail" into nyc-mr1-dev