Merge "Fix TaskRecordTests#testRestoreWindowedTask serialization test"