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

* commit '7b5e3ff5721b12d7f1bc47e298e5e40312378e51':
  Focus security fields before widgets.