Merge "Do not reload bitmap unless necessary" into oc-dr1-dev am: c4c5d60607
am: 7ab87b35f1

Change-Id: Ic24856152dda569dff27ef5dc219c19e7a783a63