Merge "Optimize canSafelyMutateDrawable()" into nyc-dev