Merge "Make nfc toggability logic static and public." into oc-dr1-dev