Merge "Mako: NFC: make sure the eSE is selected by default." into jb-mr1.1-dev