Merge "Move PIP/MW mode callbacks to be on the client side" into rvc-dev am: 28c136e1cb am: 33e9c04263 am: 0f463c21cb

Change-Id: I953b9c53947b49d5ff61eced79c39bc4bc2715b5