Merge "Show x for short period of time when activity is PIP'd" into oc-dev am: 56069d7146
am: f0caa83702

Change-Id: I90144f8bf5d7d030aed106116b2e231a62c29bd5