Merge changes I44ba0f9a,I70afa777 into sc-dev

* changes:
  Fix the live caption tooltip, which was sad and broken.
  Clip caption container to outline so the ripple doesn't extend past the circular bounds.