Merge changes from topic 'smooth_unlock' into nyc-mr1-dev

* changes:
  Keyguard: Improve trusted unlock while occluded
  Keyguard: Refactoring for improving trusted unlock while occluded