Merging Jan's autolayout update to keyboard
Trying to merge.