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

Change-Id: I5c42cb241ef98bc5e70b03d460230e3ac2115240