Set window active instead of new on room subject
Merge branch 'master' into plugins