Merge "Always Return Adaptive Icon" into main