Merge "Make sure the relayoutWindow is called when Activity restarted" into tm-dev