Merge "Protect animation methods from Proguard."