Merge "Camera: Avoid possible NPE when forwarding images" into sc-dev