Merge "Add support for the PointerLocation overlay." into gingerbread