Merge "ShortcutManager: Update foreground check." into nyc-mr1-dev