Merge "Do not reload bitmap unless necessary" into oc-dr1-dev