Merge "Move widget save state I/O job out of critical paths" into main