Merge "Fix #38218977 : NPE restoring widget mappings" into oc-dev