Merge "Better handle large display and text scaling on EDU tooltip." into udc-dev