Merge "Simplify the association of shared starting window" into tm-qpr-dev