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

Change-Id: Ia0b6863fa82f33d03903f6e17739f8ad339246c5