Merge "Fix updating icons with BigPictureIconManager after reinflating the layout" into main