Change locators to address intermittent failures
The old analog clock locator was changing its size and location
Merge pull request #959 from bobsilverberg/fix_clock_switch

Change locators to address intermittent failures