Merge "Simplify watcher count display in Pending Changes table"