Merge "Add new flag for XR-specific manifest entries" into main