Revert "Revert "Fixed animation breakage when QS area tapped during expand/collapse""

This reverts commit b590a6fa.

Reason for revert: Applying fix and relanding

Test: manual & tablet scenario tests to confirm split shade unaffected
Change-Id: If4f59e5a20e5fcdcbd81b8ecb29741741818ce8d