Merge changes from topic "listen_optimize"

* changes:
  Fix the issue in setting optimized listen channel
  Set p2p_optimize_listen_chan=1 to default template