Merge "Introduce and update interfaces for return animations and takeovers." into main