am 76bf4d6d: am d1f6b624: Merge "Take text alignment into account to compue text bounds Bug #10258621" into klp-dev

* commit '76bf4d6dbee90268ecdf5eab63a9048fcaa8ff02':