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