Merge "QS: Fix expanding on closing detail" into nyc-mr1-dev am: a6ab28d3c9
am: 9e1a7cea64

Change-Id: I54fd7b4ac8bb09e0b2365824eb74a3126d8ac5cd