Merge "Avoid IconView's setModalAlpha interfere with setContentAlpha" into main