Merge "Camera: reset callback after test done" into oc-dev am: 72ff9a1e38 am: e31ea3ab65  -s ours
am: 04eab47d94  -s ours

Change-Id: I85cf0b94ddc58f0c7c015741cc06886977ac3f2c