Merge "ShortcutManager: rescan all apps after next OTA" into nyc-mr1-dev