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

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