Merge "Load correct resources for pointer icon on external screen"