Merge "Remove unnecessary casts on calls to findViewById" into oc-dev