Bug 911576 - fix bug of unwatch for screen_layout.js