Merge "Migrate ShortcutHelper from Activity to BottomSheet Dialog." into main