Merge "Make SubtitleController thread safe" into klp-dev