Merge BundleConfig change to VSIX

Merge BundleConfig change to VSIX content