Merge "Make "Drag failed" animation comply with Material Design"