Merge "Support hotspots in View drawables"