Merge "Fix possible NPE in PointerLocationView"