Merge "DO NOT MERGE Add network logging icon to Quicksettings when enabled" into nyc-mr2-dev