Merge "Move clock centering and size logic from npvc." into main