Merge "Use the custom name in the battery attribution if it is unknown item" into tm-dev