Fix bug where icon is no present during app close animation. am: bc27826478 am: aca4f39f0e
am: 49bc4241d9

Change-Id: Ifb7f31ff6948688b706a1196517a0e643ba339eb