Merge "Fix issue #23122445: Add 420 density" into mnc-dev