Merge "Add textview and framelayout inflation cases, refactor."