Merge "Fix ViewPropertyAnimator duration and startDelay issues"