Merge "Don't throw when noting ENABLE_MOBILE_DATA" into main