[ronghao]fix login activity issue
Merge remote-tracking branch 'origin/master'