Merge "Paint current points a different color in PointerLocation"