fix mobile activity issue
merge develop