Merge "Fix bad merge causing Recents to be started twice in succession." into oc-dev