Merge "Fix cropped pre-archived app icons by converting to a fixed Adaptive Icon" into main