Merge "Merge "PIP: Prevent PIP icons in Recents from blinking when PIP is...
Merge "Merge "PIP: Prevent PIP icons in Recents from blinking when PIP is closed" into nyc-dev am: cbb128a5 am: a018afd7" into nyc-mr1-dev-plus-aosp
am: 54c24c6f
* commit '54c24c6f':
Change-Id: I91d1db0fdff4fca9901bc6a69a66dd57521747f9