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

Change-Id: I1999e74cd8a2d3469c3038166c20df1716e6db22