Merge "Remove unused 'XMPGetInfo' and 'XMPGetResults' hooks"