Merge "Fix Process_LockedKeysShouldToggleAfterReattach test failure"