Merge branch 'release-2.2'
Merge branch 'r_2.2.0'
update build script for version update
correct finish logic when the onBackPressed function is called
Merge branch 'hotfix-FrontAcitivty_finish' into develop