Merge "Camera: fix race in onRepeatingRequestError callback" into oc-mr1-dev