Merge "AutoSize TextView - take horizontalScrolling into account" into oc-dev