Merge "chain resolution improved in ios-xe renderer"