Merge "AutoSize TextView - take horizontalScrolling into account" into oc-dev am: 2ed861d560
am: bf0a4e1de8

Change-Id: I99612b644c50029800f4b9171218c8bdde90ecf8