Merge "Change PIP notification icon" into oc-dev am: 9f3967fee1 am: 745bbf758d
am: faf8b8a9ee

Change-Id: I71bcda9ff79c411eb1310e3c958b05272a3ef67b