Merge "Cleanup in BigPictureIconManager" into main