Merge "Update orientation before executing transition by starting window" into tm-dev