Merge "Fix split screen app chip position in portrait mode" into main