Merge "Fix m11 to be Y scale instead of X" into jb-mr1-dev