Fix watch tooltips appearing at wrong location

Change-Id: Ie4a7cda4af48f8a2c96ecd01ba7f630728a9adb9