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

Change-Id: I3115e5094ee9e1931fed3e3d86420b08bd1de0d0