Merge "Don't retain a bitmap unnecessarily" into oc-mr1-dev