Merge "Only do the ble scan if association isNotifyOnDeviceNearby" into tm-dev