Merge "[Dual Shade] Remove codename from the aconfig flag description." into main