[Branch: th/two-steps-ux] Fix brush preview UI