Merge "Ensuring that Recents' orientation matches the app behind it."