Merge "Add more device entry icon transition support" into main