Merge "[Magnifier-23] Fix invisible cursor in magnifier"