Merge "Fix bug 5231904 - Fix wobbly progress spinners"