Merge " Add a flag for calling old ChooserTargetService API & remove flags for Shortcuts."