Merge "Fixing proguard issue for resize animations"