Merge "Camera: remove stream_configuration_counter"