Merge "[IT4.21] Update the label type of idle timer"