Merge "Camera: More fixes on assert() within functions" into main