Merge "Fix ANR due to `updateShortcuts` called in the main thread" into main