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