Merge "Make test UI fit to clockwork." into lmp-sprout-dev