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

Change-Id: I7399fcf583823b3ab8f901c6c454a774deab4f02