Merge "Update wifi header summary text to show metered state" into pi-dev