Merge "Code Patch for camera preview switch tests" into nyc-dev