Merge "Shift+Meta+Space should reverse-rotate subtypes part 2." into nyc-dev