Merge "Revert "Improve error message for grayed out submit buttons""