Merge "Support mouse pointer on external displays (2/2)"