Merge "fix cursor visible issue" into devel/master