Merge "Fix mouse pointer not getting enlarged"