Merge "Fix multiple divider when resize with rotate" into udc-dev