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