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

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