Merge "Move PipMediaController from pip/phone/ to pip/"