Merge "[Panlingual] Add a flag to control opt-in/out" into tm-dev