Merge "Revert "Camera: SessionConfiguration should use Executors"" into pi-dev