Merge "Update cellular data condition icon and padding." into pi-dev