Merge "Remove subtitle of system default" into tm-dev