Merge "Resize large app icons before adding them in a parcel" into main