Merge branch 'master' into dev

app/build.gradle

@@ -17,8 +17,8 @@ android {
         resValue "string", "app_name", "NewPipe"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 970
-        versionName "0.21.4"
+        versionCode 971
+        versionName "0.21.5"
 
         multiDexEnabled true
 

fastlane/metadata/android/en-US/changelogs/971.txt

@@ -0,0 +1,3 @@
+Hotfix
+• Increase buffer for playback after rebuffer
+• Fixed crash on tablets and TVs when clicking on the play-queue icon in the player