Merge "Fix a flicker when opening app again quickly while it\'s exiting" into nyc-dev
am: a806e8ab12

* commit 'a806e8ab1213ef420c9c0d541dbbe96a7d9f1472':
  Fix a flicker when opening app again quickly while it's exiting

Change-Id: I5b993179c73b8204f0a2be922a6a315bfefaca0f