Merge "Include ActivityRecord in the transition when windowingMode changed" into tm-dev