Merge "Fix ExitPipWithDismissButtonTest#focusDoesNotChange" into tm-dev