Merge "Add device in changelog" into ics