Merge "Camera: reset callback after test done" into oc-dev am: 72ff9a1e38  -s ours am: e2f3270db5  -s ours am: b026c45b29  -s ours
am: 183d5af38d  -s ours

Change-Id: I538e1749e8b41808450b4617b3b3a3ca56ce0a2b