Merge remote-tracking branch 'origin/master'

# Conflicts:
#	entry/src/main/ets/view/LocalMusic.ets

entry/src/main/ets/pages/SettingPage.ets

@@ -189,6 +189,7 @@ export struct SettingPage {
             Image($r('app.media.kp_music_nor'))
               .width(22)
               .height(22)
+              .visibility(Visibility.None)
               .alignSelf(ItemAlign.Center)
               .margin({ left: 28 })
           Text('深色模式')
@@ -229,6 +230,7 @@ export struct SettingPage {
             Image($r('app.media.kp_music_nor'))
               .width(22)
               .height(22)
+              .visibility(Visibility.None)
               .alignSelf(ItemAlign.Center)
               .margin({ left: 28 })
           Text('记忆播放')
@@ -256,6 +258,7 @@ export struct SettingPage {
             Image($r('app.media.kp_music_nor'))
               .width(22)
               .height(22)
+              .visibility(Visibility.None)
               .alignSelf(ItemAlign.Center)
               .margin({ left: 28 })
             Text('播放背景随音乐封面')