Merge "BigPictureStyle: discard empty Icon BitmapDrawables" into main