Update to Combat Fix

The watch frame auto hides when combat is triggered and reappears when
combat ends.