Merge "Update output chooser for calls"