Merge "Fix transition delay tracking when starting activity from recents" into nyc-dev