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: I936bcb7b7bd3610a7fb89c9ec51333be3d46506a