Squashed commit of the following:

William Hsu test_settings_change_keyboard.py