Merge "Merge "Fix a flicker when opening app again quickly while it\'s...
Merge "Merge "Fix a flicker when opening app again quickly while it\'s exiting" into nyc-dev am: a806e8ab am: 87704f68" into nyc-mr1-dev-plus-aosp
am: c6b3b7b6
* commit 'c6b3b7b6':
Change-Id: I866284e45ad41a1533565a23f5da5a8439a2e062