Flip clock issue sizing after 1.8.6 update

Have just upgraded to 1.8.6 and all gone well.
I saw there was a fix for the spacing used by the seconds on the flip clock.
My layout uses the flip clock so double checked the layout only to find that the flip clock is now quite large, and when I try to scale it down, it only shrinks so far before it starts cutting the bottom of the clock off instead. If I put seconds back on, I can then reduce further, but I dont want the seconds. When seconds are removed, the size is increased again of the flip clock, but the region it sits in chops off the clock.

Unfortunately we introduced a new bug when we adjusted the seconds/no seconds functionality - you can find it described here, with a workaround: