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

Merge commit 'e9fbd0394b172182a16da571904af967620592d3'

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