am eadd2134: Merge "Focus security fields before widgets." into klp-dev

* commit 'eadd21343ca35613dd4aa285b16e40033fe0d225':
  Focus security fields before widgets.