Merge "Revert "Support mouse pointer on external displays (1/3)""