Merge "Fixes recents from disappearing when split and restarted" into oc-mr1-dev