Merge "Skip updating mode list entries for unchanged modes" into main