Merge "Remove XMPReader back compat"