Merge changes from topic "hce_afw_fix"

* changes:
  Fix incorrect checking logic for preferred service
  Do not set default contactless application without user interaction