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