Merge "Fix init of Animation in View drawing code"