Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev