Merge "Fix a flicker when opening app again quickly while it\'s exiting" into...
Merge "Fix a flicker when opening app again quickly while it\'s exiting" into nyc-dev am: a806e8ab
am: 87704f68
* commit '87704f68':
Fix a flicker when opening app again quickly while it's exiting
Change-Id: Ie0248b72f18eb40d6fe7d4a7daa8455cab860142