Merge remote-tracking branch 'origin/wjc' into release0123

wxr

2022-06-30 8784b669c284e02f0a4d2d9aacefc408196c8583

1
2
3
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
</adaptive-icon>