Merge "Scale the surface by progress when auto enter PiP" into tm-qpr-dev