Merge "Resubmit of 'Fix for isssue 3369932 : stopPreview returns 0'" into honeycomb