Merge "AutoSize TextView (part 9) - sanitize APIs naming"