Merge "Improve error messages for initial switch state."