Merge "ShortcutManagre: foreground check, more tests."