Merge changes from topic "fix_invalidatd_key"

* changes:
  Fix use of auth-bound keys after screen lock removal
  Fix retreiving characteristics file for grant key