Merge "qcacmn: Clean up MAX_BCN_PROBE_IN_SCAN_QUEUE"