Merge "Removing unused drawables"