Merge "Revert "Update Status Bar with Badged Wifi Icons."" into oc-dr1-dev