Merge "Improve error message for grayed out submit buttons, 2nd edition"