Merge "SF: Lock access to InputWindowCommands"