Merge "Polish transfer starting window across more than two activities." into main