Merge "Allow SelectWithInput to be marked as required and handle that dynamically"