Disable save button (and Alt+S) on conflict

In the conflict pane, we hide the save button, so disabling it doesn't
make a visual difference, but it also disables the Alt+S access key.

Change-Id: I8c0d92a40a02d525ec10932656ebf38a74a97cd4
Merge "Disable save button (and Alt+S) on conflict"