Merge "Fix bootanimation stack overflow"