Simplifying the keyboard lock.
Merge branch 'modularisation'

* modularisation:
  Simplifying the keyboard lock.