Merge of latest bzr/ubuntu-keyboard changes, with audio feedback included