Merge "Prevent ViewPropertyAnimators from getting started twice" into jb-dev