Merge "Reset mPointerIconShape properly on window manager."