Merge "Add an optional extra field description for ACTION_CHANGE_DEFAULT"