Merge "Fix screenshot when navigating between tasks"