Merge "widget changes to upload single JS file"