Merge "Don't show wifi in status bar in QS DO NOT MERGE" into oc-dev