Merge branch 'upstream' into 'master'

app/src/main/res/drawable-hdpi/metronome.png

app/src/main/res/drawable-hdpi/papercraft.png

app/src/main/res/drawable-hdpi/peertube.png

app/src/main/res/drawable-mdpi/metronome.png

app/src/main/res/drawable-mdpi/papercraft.png

app/src/main/res/drawable-mdpi/peertube.png

app/src/main/res/drawable-xhdpi/metronome.png

app/src/main/res/drawable-xhdpi/papercraft.png

app/src/main/res/drawable-xhdpi/peertube.png

app/src/main/res/drawable-xxhdpi/metronome.png

app/src/main/res/drawable-xxhdpi/papercraft.png

app/src/main/res/drawable-xxhdpi/peertube.png

app/src/main/res/drawable-xxxhdpi/metronome.png

app/src/main/res/drawable-xxxhdpi/papercraft.png

app/src/main/res/drawable-xxxhdpi/peertube.png

app/src/main/res/values/iconpack.xml

app/src/main/res/xml/appfilter.xml

app/src/main/res/xml/drawable.xml

icons/metronome.svg

icons/papercraft.svg