Fix chat focus issues once and for all
Merge remote-tracking branch 'melanie_t/master'