Merge "Show error code in WFC error notification." into oc-dr1-dev