Merge branch 'fix-oreo-network-control-option' into 'v1-oreo'

[RELEASE] Sprint JJ Fixed `no network control option visible in Oreo`

See merge request e/apps/eDrive!30
1 job for v1-oreo in 2 minutes and 29 seconds (queued for 1 second)