Merge "Workaround for empty recents, defer the enter animation." into nyc-dev