Merge "Disable notification scans when p2p is connected" into jb-mr1-dev