Merge "AdaptiveIconDrawable should not update layer bounds when bound is empty" into oc-dr1-dev