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

* commit '0100a310d8184baf9576925d160f8af09aa93b10':
  DO NOT MERGE Add preference for caption text opacity