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: 3f8315a9
am: 4b73b0cf
* commit '4b73b0cf':
Fix a flicker when opening app again quickly while it's exiting
Change-Id: Ife2162ccada2aea28c68e8a8d1a2f7960e2a32de