Merge "Unit testing ButtonDropTarget" into udc-dev