Merge "Fix several issues with RecentsAnimation"