Merge "Refactor ShortcutsChangedTask to Kotlin" into main