Merge "PiP: Recalculate size if too big/small on display change." into sc-v2-dev