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

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