Merge "may fix 3097381 and 3097482. don't abort on/off if the animation fails" into gingerbread