Merge "Rename duration scale hint types in xml"