Merge "Camera: Various offline processing fixes"