Merge "Use consistent Wifi-only checking" into sc-dev