Update monitors when setting *_monitors
Merge remote-tracking branch 'upstream/master' into java_focus_fix