am c37db9c0: Merge "Fix layout and invalidate in SubtitleView" into klp-dev

* commit 'c37db9c0de1038d043051401c2c55a8d0a57f373':
  Fix layout and invalidate in SubtitleView