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