Merge "Remove an ICS workaround calling stopPreview." into ub-camera-everglades