Merge "Renew the highlight state color" into tm-dev