Merge "When not provided set viewerConfigInputStreamProvider from viewerConfigFilePath" into main