Merge "Fixes recents from disappearing when split and restarted" into oc-mr1-dev am: f49f8f6f24
am: a659bb958e

Change-Id: I17aa02521a8226929fc04ccd36bf895351e10cfc