Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/zxhy/hfilemanagermaster/duplicate/DupPictureActivity.kt
#	app/src/main/java/com/zxhy/hfilemanagermaster/internalstorage/InternalStorageActivity.kt
#	app/src/main/res/layout/activity_internal_storage.xml