Merge "Fix NPE during restartBleScan() when scanner is null" into sc-v2-dev