Merge "Associate RenderNodes created for hw bitmap w/ views" into oc-mr1-dev