Isira Seneviratne
ded7205588
Merge branch 'dev' into Merge-dev-to-refactor
# Conflicts:
# app/build.gradle
# app/src/main/java/org/schabi/newpipe/App.java
# app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt
# app/src/main/java/org/schabi/newpipe/about/LicenseFragment.kt
# app/src/main/java/org/schabi/newpipe/local/subscription/ImportConfirmationDialog.java
# app/src/main/java/org/schabi/newpipe/player/Player.java
# app/src/main/java/org/schabi/newpipe/player/PlayerService.java
# app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java