Merge "Do not change surface of system window token for transition" into tm-qpr-dev