Merge "Prevent trimming recent tasks belonging in different stacks. am: 29dbc3cc47 am: 4a119bc588" into nyc-mr1-dev-plus-aosp