Merge "Private space header to support RTL" into main