[automerger] Tweak and fix bugs with new app close transition. am: 973622e8ec

Change-Id: I5709f5fe304551f9e9fff25ecba930119768cc57