Merge "Don't show the submit button when it isn't enabled." into ics-mr1