Merge "Camera: reset callback after test done" into oc-dr1-dev am: eba1407b55  -s ours
am: 8d1ef0505f

Change-Id: I7f26656d68a93daadec816d3fe28a000212dd9e4