Merge "Fix Wifi off state UI"