Merge "AutoSize TextView - major fixes" into oc-dev