Merge "ShortcutManager: Support secondary text field." into nyc-dev