Merge "Not assuming reverse order of menu shortcuts" into sc-dev