Merge "Don't show tap&pay if NFC is off." into klp-dev