Merge "Fix perf regression from scale/density mismatch" into jb-mr1-dev