am 7f90678d: am f70fbe70: Merge change I461073bb into eclair

Merge commit '7f90678dad159eb284d4f16d55890761835d24cb' into eclair-mr2-plus-aosp

* commit '7f90678dad159eb284d4f16d55890761835d24cb':
  Fix exit animation of top icon when present.