impl uiactivity
Merge branch 'uiactivity'