Merge branch 'release/v2.2.4' into develop
add apk icon masking
update package version
Merge branch 'release/v2.2.5' into anthpack-v2