Merge "Correct position of divider bar when get display insets" into udc-dev