Merge "Camera: Don't switch image callbacks during extension sessions" into sc-dev