Clock centering falls back to lockscreen behavior

It doesn't look like the else case was hit in very many cases before,
but now it's being triggered when moving to/from hubmode. This ensures
the clock doesn't pop back to the center during that transition. I also
refactored the combine clause a bit.

Bug: 409728064
Flag: NONE Minor fix
Test: Manually checked centering behavior
Change-Id: I1f90b5722345adb6bdfd08cc9422cae9c440792d