(cherry picked from commit 27889ea1)
(cherry picked from commit 38f288c5)

(cherry picked from commit 27889ea1)

# Conflicts:
#	uni_modules/uni-usercapturescreen/changelog.md
#	uni_modules/uni-usercapturescreen/package.json

# Conflicts:
#	uni_modules/uni-addPhoneContact/utssdk/interface.uts
#	uni_modules/uni-arrayBufferToBase64/utssdk/interface.uts
#	uni_modules/uni-authentication/utssdk/interface.uts
#	uni_modules/uni-authentication/utssdk/protocol.uts
#	uni_modules/uni-base64ToArrayBuffer/utssdk/interface.uts
#	uni_modules/uni-canvas/utssdk/interface.uts
#	uni_modules/uni-chooseLocation/utssdk/interface.uts
#	uni_modules/uni-clipboard/utssdk/interface.uts
#	uni_modules/uni-createInnerAudioContext/package.json
#	uni_modules/uni-createInnerAudioContext/utssdk/app-android/AudioPlayer.kt
#	uni_modules/uni-createInnerAudioContext/utssdk/interface.uts
#	uni_modules/uni-createIntersectionObserver/utssdk/interface.uts
#	uni_modules/uni-createSelectorQuery/utssdk/interface.uts
#	uni_modules/uni-createWebviewContext/utssdk/interface.uts
#	uni_modules/uni-event/utssdk/app-ios/native.swift
#	uni_modules/uni-event/utssdk/interface.uts
#	uni_modules/uni-exit/utssdk/interface.uts
#	uni_modules/uni-file/utssdk/interface.uts
#	uni_modules/uni-fileSystemManager/utssdk/interface.uts
#	uni_modules/uni-getAppAuthorizeSetting/utssdk/interface.uts
#	uni_modules/uni-getAppBaseInfo/utssdk/interface.uts
#	uni_modules/uni-getBackgroundAudioManager/package.json
#	uni_modules/uni-getBackgroundAudioManager/utssdk/app-harmony/index.uts
#	uni_modules/uni-getBackgroundAudioManager/utssdk/interface.uts
#	uni_modules/uni-getDeviceInfo/utssdk/interface.uts
#	uni_modules/uni-getElementById/utssdk/interface.uts
#	uni_modules/uni-getEnterOptionsSync/utssdk/interface.uts
#	uni_modules/uni-getLaunchOptionsSync/utssdk/interface.uts
#	uni_modules/uni-getLocation/utssdk/interface.uts
#	uni_modules/uni-getNetworkType/utssdk/interface.uts
#	uni_modules/uni-getRecorderManager/utssdk/interface.uts
#	uni_modules/uni-getSystemInfo/utssdk/interface.uts
#	uni_modules/uni-getSystemSetting/utssdk/interface.uts
#	uni_modules/uni-getbatteryinfo/utssdk/interface.uts
#	uni_modules/uni-keyboard/utssdk/interface.uts
#	uni_modules/uni-loadFontFace/utssdk/interface.uts
#	uni_modules/uni-makePhoneCall/utssdk/interface.uts
#	uni_modules/uni-media/utssdk/app-android/libs/nativeobj-preview-release.aar
#	uni_modules/uni-media/utssdk/app-android/utils/ChooseMediaUtils.uts
#	uni_modules/uni-media/utssdk/app-harmony/media/media.uts
#	uni_modules/uni-media/utssdk/interface.uts
#	uni_modules/uni-navigationBar/utssdk/interface.uts
#	uni_modules/uni-network/utssdk/interface.uts
#	uni_modules/uni-oauth/utssdk/interface.uts
#	uni_modules/uni-openDocument/utssdk/interface.uts
#	uni_modules/uni-pageScrollTo/utssdk/interface.uts
#	uni_modules/uni-payment/utssdk/interface.uts
#	uni_modules/uni-privacy/utssdk/interface.uts
#	uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_app_uni_prompt_ac_recyclerview_layout_top.xml
#	uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_app_uni_prompt_ac_recyclerview_layout_top_night.xml
#	uni_modules/uni-prompt/utssdk/interface.uts
#	uni_modules/uni-rpx2px/utssdk/interface.uts
#	uni_modules/uni-scanCode/utssdk/interface.uts
#	uni_modules/uni-shareWithSystem/utssdk/unierror.uts
#	uni_modules/uni-stat/utssdk/common/core/stat.uts
#	uni_modules/uni-storage/utssdk/interface.uts
#	uni_modules/uni-tabBar/package.json
#	uni_modules/uni-tabBar/utssdk/interface.uts
#	uni_modules/uni-theme/package.json
#	uni_modules/uni-theme/utssdk/app-android/index.uts
#	uni_modules/uni-theme/utssdk/app-ios/index.uts
#	uni_modules/uni-theme/utssdk/interface.uts
#	uni_modules/uni-usercapturescreen/utssdk/app-harmony/index.uts
#	uni_modules/uni-virtualPayment/utssdk/interface.uts
#	uni_modules/uni-websocket/utssdk/interface.uts
#	uni_modules/uni-websocket/utssdk/protocol.uts