Merge "make transform hint multi-display aware" into jb-mr1.1-dev