Overhaul CenterClock visibility handling

Change-Id: Ie5f02864c3ef572de422eebae5631fe3a8640734