Merge "Fix PiP being out of bounds when launched into forced orientation"