Merge branch 'transfer-fix' into 'master'

File transfer and Hatchery fixes

See merge request card10/companion-app-android!16
1 job for master in 4 minutes and 14 seconds (queued for 4 seconds)