[OS-BUILD PATCHv4 2/2] Update CONFIG_WATCH_QUEUE