Merge "Fix alpha on wifi disconnected icon" into oc-dev