Refactorings to support remote drawables