Address review feedback for feature branch

3 jobs for !1515 with 1081-share-app-via-wifi-hotspot in 11 minutes and 54 seconds (queued for 4 seconds)
detached
Status Job ID Name Coverage
  Test
passed #11117
test

00:11:54

 
  Optional Tests
manual #11118
kvm allowed to fail manual
android test
manual #11119
allowed to fail manual
bridge test