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

Change-Id: I73fd01b193324ab9b4c1320e47ab8be1d77a3cc2