Merge "Add the battery information into device details header" into tm-dev