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

Change-Id: I052945c5d94106877614f5f0f11ee3b3a7f67121