Merge "Flag for supporting resume widget restore after reboot" into main