Detect version mismatch and remove extra layer for ndef
msg during 'ndef-discovered'
Merge branch 'master' of ssh://github.com/svic/mozilla-central into master2