Merge "Use the correct item animating height depending on view, device"