Further mute keyboard shortcuts when disabled

Change-Id: Ie0230a6fcd4a1e5b80f6dfc0eb33c6f4904bbe96
Merge "Further mute keyboard shortcuts when disabled"