Merge "Avoid reading HW bitmap pixels twice" into oc-dev