Merge "Adding back recents grow in split screen" into oc-mr1-dev am: 45e7a4242b
am: d88daca659

Change-Id: I90aadbe557305c3faf248e29f0ea537d35fae9f2