Merge "AutoSize TextView - fix measurements" into oc-dev