Merge "IMS-VT: FR36492 - UI to disable picture in picture mode"