osd: fix watch ordering bug 10441 option b