Merge "Make PiP reentry state to use scale instead of size" into main