Merge "Adding XR software and hardware feature configurations" into main