Merge "Fix cursor display issue." into devel/master