Merge "ShortcutManger: Auto-adjust ranks." into nyc-mr1-dev