Merge "Merge "Don't show wifi in status bar in QS DO NOT MERGE" into oc-dev am: 6d4db456 am: 6f9e2050"