Merge "Fix split divider janky" into rvc-dev