Merge "Waits for windowMagnification connection set when requesting enableWindowMagnification" into tm-dev