Merge "Extra logging related to widget removal upon restore"