Merge "Enable cursor to transition across multiple displays" into main