Merge "Change the id for color sections and its ancestor." into tm-dev