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

2 jobs for translations in 1 minute and 15 seconds (queued for 2 minutes and 8 seconds)