Merge "Fix wifi data activity icons"