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

wxr

2022-04-14 f48b20ee2ed48652ff4f0bfcdc2cfb8b9340685c

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