Merge "Fix SystemUI crash on devices with WiFi only" into klp-dev