KeyOverride: adapt for Settings

Change-Id: I18f887f8fd6618e02db8966839093a3767310e31