Merge "BigPictureStyle: add _discard_empty_icon_bitmap_drawables flag" into main