Merge "Do not include project watchers on new draft changes" into stable-2.10