Merge "DO NOT MERGE: ScanFilter: Fix argument sanitization logic." into qt-dev