Merge "owe: enable ptk woraround for OWE backward compatibility" into tm-qpr-dev