[OS-BUILD PATCHv3 2/2] Update CONFIG_WATCH_QUEUE