Fixed the cannot find active player issue when start up
Merge branch 'timetree' into wat
Merge branch 'fix' into wat
changed