Merge "PointerLocationView: Display orientation correctly." into gingerbread