Merge "Do not substarct outline width in text-controller" into devel/master