Added extra check for WatchFrameCollapseExpandButton.