am 974a6e12: Merge "Make SubtitleController thread safe" into klp-dev

* commit '974a6e1231f80644e382567c5f0a5fb9b6962d27':
  Make SubtitleController thread safe