Merge "Support unique calibration per orientation"