Merge "Do not block transition by non-resumed relayouted activity" into main