Merge "Fix mPositionInWindow to not use global coords" into sc-dev