Merge "Camera: synchronize access to mMemoryMap" into oc-mr1-dev