Merge "Moving the resources related to PiP to the WindowManager/Shell." into tm-dev