trying to pull in some improvements from countly branch, without merging in countly branch
fixed animation freeze issue