Bug 911576 - fix bug of unwatch for screen_layout.js
Merge pull request #11875 from cctuan/911576

Bug 911576 - [Flatfish] fix bug of unwatch for screen_layout.js