Merge branch 'master' of https://git.frostnerd.com/PublicAndroidApps/smokescreen into translations

2 jobs for master in 5 minutes and 17 seconds (queued for 4 seconds)