Merge "Support density override with scaled density."