Merge "Fix null deref in camera service" into main