Merge "ShortcutManager: deal with changing resource IDs on app update" into nyc-mr1-dev