Merge "Fix text sizes and alignment in drop target" into udc-dev