Merge "Make variant selection menu toggleable by keyboard"