Merge "Fix ANR on ShorcutManager#getPinnedShortcuts" into sc-dev