Merge "Removed deprecated ExtractThumbParameters hook"