am c736f794: am a74da813: am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev

* commit 'c736f794ac38b832b5ffde28502580a9b20b722b':
  DO NOT MERGE Remove extra fragment in captioning preferences