Merge \"QS Detail: Fix up open/close animations\" into nyc-dev
am: ac2e291832

Change-Id: I1ac6fae02a4946ca83fd466b815ec4788399d4d0