Merge "Undo the Extensions API version change" into tm-qpr-dev