Merge branch 'master' into sponsorblock

# Conflicts:
#	README.md
#	app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
#	app/src/main/java/org/schabi/newpipe/player/Player.java
#	app/src/main/java/org/schabi/newpipe/settings/SettingsResourceRegistry.java
#	app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
#	app/src/main/res/values-es/strings.xml
#	app/src/main/res/values-it/strings.xml
#	app/src/main/res/values-zh-rTW/strings.xml
#	app/src/main/res/values/strings.xml
#	doc/README.es.md
#	doc/README.ja.md
#	doc/README.ko.md
#	doc/README.pt_BR.md
#	doc/README.ro.md
#	doc/README.so.md
#	doc/README.tr.md

Merge pull request #305 from the-blank-x/ryd-runonuithread

Attempt to fix crash by RYD showing dislike info while screen is being rotated

Merge branch 'master' into sponsorblock

# Conflicts:
#	app/src/main/java/org/schabi/newpipe/NewVersionWorker.kt
#	app/src/main/java/org/schabi/newpipe/error/ErrorUtil.kt
#	app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java
#	app/src/main/java/org/schabi/newpipe/player/ui/VideoPlayerUi.java
#	app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
#	app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
#	app/src/main/res/values-es/strings.xml
#	app/src/main/res/values-it/strings.xml
#	app/src/main/res/values-zh-rTW/strings.xml

Merge branch 'master' into sponsorblock

# Conflicts:
# app/src/main/res/values-es/strings.xml
# app/src/main/res/values-it/strings.xml
# app/src/main/res/values-zh-rTW/strings.xml
# app/src/main/res/values/strings.xml

manually applied changes in PR #212, with some other small changes

Merge branch 'master' into sponsorblock

Merge branch 'master' into sponsorblock

# Conflicts:
#	app/build.gradle

updated version

fixed some merge issues

restoring fork-specific update functionality