am 028b6b3f: Merge "Don\'t show tap&pay if NFC is off." into klp-dev

* commit '028b6b3f7cc79587a42583351e2c032f71e7ac8c':
  Don't show tap&pay if NFC is off.