Merge "Fix display projection transforms" into jb-mr1-dev