Merge "Don't retain a bitmap unnecessarily" into oc-mr1-dev
am: 8ede87ded8

Change-Id: I3bfdd696cfd7abb1cb9ff04d93b7ebe3953280c9