Merge "Fix flakey shortcut manager tests."