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':
Change-Id: I7d705ed4d05c6ca421373338edf63b8f9ee3fac6