Merge "Camera: Fix unstable test result on testpreviewcallback" into gingerbread