Merge "Fixing an issue with the drop target font becoming very small for removing and uninstalling. I also verified that this doesnt break a fix presented in b/264732627" into udc-dev