Merge changes I30a2fa4f,I1abd1561 into rvc-dev

* changes:
  Fix cliping when the media player is fully clipped off
  Fixed some cases where we were animating Qs even though we shouldn't