Merge branch 'release-changes' into 'master'

Fix jumpy scanner UI and manual set time button

See merge request card10/companion-app-android!17
1 job for master in 3 minutes (queued for 2 seconds)