Merge "API fix in CheckedTextView" into jb-dev