Merge "Restored widget provider id not properly updated." into lmp-dev