Merge "Le Scan: Add ambient discovery mode (2/2)"