Merge "Fixes recents entrance animation when launching before onStop happens" into oc-mr1-dev am: b85cba31 am: 4121ef72 Change-Id: Id059513d9e45330373542a45255a770032feec7f