Merge "AutoSize TextView - take horizontalScrolling into account [CTS]" into oc-dev