Merge "Adding consistent platform PiP action asset." into oc-dev