Merge "ScanResult: add clarifying comments to |flags| and |capabilities| fields" into nyc-dev