Merge "Fix widget files remapping" into sc-dev