Merge "Version adaptive icon to v26"