Merge "Workaround launching PiP task with CLEAR_TASK & NEW_TASK flag." into oc-dev