Merge "Allow ExtractThumbParameters before local regexp"