Merge "Add the RF setting and enable the hybrid polling mode." into jb-dev