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

Change-Id: I9fc712b5b5d96398177883b1979a3ea5744efa89