am f15f6a50: Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev

* commit 'f15f6a5087f22a0d083be9edc08e860e51c9a0d0':
  Invalidate SubtitleView during setText()