Merge "Use the new shortcut manager APIs"