Merge "DarkIconRepository: add display id parameter" into main