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

Change-Id: I0378c30d344504474434bb645df3af58e768ed28