Merge "Refrain from returning mutable pending intent in getShortcutIntent" into sc-dev