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

Change-Id: I7a46bbcb24fbd4886bc796cfafe7bc72edae6b33