Merge "Tweak overlay display adapter scaling." into jb-mr1-dev