Merge "Fix checking if PiP aspect ratio has changed"