Merge "YouTube and YTMusic trigger a race which causes the AnimatorSet to hang" into tm-dev