Merge "Don't restart RF discovery if not needed." into jb-mr2-dev