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

Change-Id: Iba963028578a82ca01322552a284db16845edac1