Merge "Add config flag for CallingAccountSelector"