Merge remote-tracking branch 'origin/newmainactivity'