Merge "Fix a couple more issues with canceling the recents animation w/ screenshots" into sc-dev