Pulling in changes to SDK 2.0 version with animations