Merge "Fixes recents entrance animation when launching before onStop happens" into oc-mr1-dev
am: b85cba311f

Change-Id: Iafe1655469943c5b49f4aaba33b43ac4ddb83d25