Merge "Convert orientation constants before further resolution."