Merge "Icon: don't create Drawables with null Bitmaps" into main