Merge "Fix flakey shortcut CTS"