Fixed a bug where the expanded layout would flash

When the heads up disappeared from the shade, it's layout would
switch to the expanded state. We're now delaying this until
the animation is done.

Change-Id: I6c5c970f6b471fb10b197922dfea520b07c84abc
Fixes: 	29318819