Merge "Add ID to secondaryOrientationHandle for tests" into rvc-qpr-dev