Merge "bootanimation: ensure that if a percent is shown, we'll get to 100."