Merge "Automatic casts for more findViewById implementations" into oc-dev