Merge proposals dependent on lp://staging/~attente/indicator-keyboard/unity-greeter-default-layout

1. unity-greeter-default-layout
2. Dependent merge proposals