Merge "Add friction icon for metered networks." into oc-dev