Merge "Fix unfold on split screen bounds"