Merge "menuselect: invalid test for GTK2"