Merge changes I062b6c37,Ie5165364,Ib3cce253 into oc-dev

* changes:
  Add remaining default media icons.
  Disable PiP when a task is locked.
  Fix issue with PiP actions flashing.