Merge "Remove translatable=false from zen mode people settings footer" into tm-dev