Merge "Fall back to NDEF push if handover SNEP get fails." into jb-dev