Merge "WM: Handle primary display orientation when calculating the transform hint"