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

Change-Id: I628c81e32efecf733c6deb73f2877b00f66fa68c