Merge "Removing AdaptiveIconDrawable Checks" into main