Merge "Update divider if split transition with display change" into udc-dev