Merge "Camera: don't hold memory map lock during callback" into oc-mr1-dev