Merge "Revert "Update Window Extensions library APIs"" into tm-qpr-dev