Merge "Fix x86 bug with restoreCallingWorkSource"