Merge "Remove unused drawables" into main