Tweaked Keyboard Settings

Change-Id: I0e5dd1c5aa426b0e6bf2804bff3dcb55f5de248b