Merge proposals dependent on lp://staging/~michael-sheldon/ubuntu-keyboard/desktop-improvements

1. desktop-improvements
2. Dependent merge proposals