Merge "Mako: NFC: Re-enable RF field events." into jb-mr1-dev