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

Change-Id: I26ee734e4924495db31fe2db7c3e726233f923bb