Merge "Use compound drawable instead of image span." into nyc-dev