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

Change-Id: I9c3263bd91e377b4342ab8184444e5230eeab511