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: b3510f53
* commit 'b3510f53':
Change-Id: Ib45ac92c3bc21448bcd7f74ddfb8a0bc2696eed4