Merge "Wifi usability: Pass callback function to WifiMetrics"