Merge "Do not redraw if no change on reparent" into udc-dev