Merge "Fix invalid outline after widget resizing" into udc-dev