[NAN] Replace session callback configuration control [DO NOT MERGE]
am: e393f57d0d  -s ours

* commit 'e393f57d0de5a27d1cfd04a8c83a61559430539c':
  [NAN] Replace session callback configuration control [DO NOT MERGE]