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

Change-Id: I2ab3b17ad9a0b4893a31d5c50f65ccf72d43c315