Merge "Update the drag handle icon of window magnification"