Merge "Do not reset surface when entering PiP" into tm-qpr-dev