Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.gradle/8.7/executionHistory/executionHistory.bin
#	.gradle/8.7/executionHistory/executionHistory.lock
#	.gradle/8.7/fileHashes/fileHashes.bin
#	.gradle/8.7/fileHashes/fileHashes.lock
#	.gradle/8.7/fileHashes/resourceHashesCache.bin
#	.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	.idea/caches/deviceStreaming.xml
#	.idea/compiler.xml
#	.idea/gradle.xml
#	.idea/kotlinc.xml
#	.idea/misc.xml
#	app/src/main/java/com/bassbooster/soundeffects/equalizer/tasks/MediaAppControllerUtils.kt
#	app/src/main/java/com/bassbooster/soundeffects/equalizer/view/activity/edgelighting/customview/ImageBorderView2.kt
#	app/src/main/java/com/bassbooster/soundeffects/equalizer/view/activity/setting/SettingActivity.kt