Merge changes from topic 'nci-2.0'

* changes:
  halimpl: Removed hardcoaded routing table.
  Enable screen on lock for ISO-DEP Protocol.