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