Tweak timer code.
Delete full screen watches when not viewing.
Resolve merge.