am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev

* commit '8840aa4c406bf08bba186cf9e674033bd1b9a4c1':
  DO NOT MERGE Add preference for caption text opacity