Merge "AutoSize TextView - API polish - no RuntimeException in signature" into oc-dev