Merge "Add test for InputReader location calibration"