Merge "Fixing issue where widgets file was getting blown away, issue: 5036321" into ics-mr0