Merge "Move PiP state check exception to the client side" into oc-mr1-dev