Merge "Camera: fix long proecessing tests" into nyc-dev