Merge "Fix for wifi detail icon disappearing" into oc-dev