Merge "Fall back to Wi-Fi data display in data usage screen with no SIM." into pi-dev