Isira Seneviratne
6486f2de56
Merge branch 'dev' into Merge-dev-to-refactor
# Conflicts:
# app/build.gradle
# app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
# app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationHelper.kt
# app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
# app/src/main/java/org/schabi/newpipe/player/PlayerService.java
# app/src/main/java/org/schabi/newpipe/player/event/PlayerServiceExtendedEventListener.java
# app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java
# app/src/main/res/values-is/strings.xml