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

Change-Id: I4a453961ac6e909b63003ba180e4845cb801d249