Merge "Update more implementations of findViewById()" into oc-dev