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

Change-Id: I48f1fd5730232c6978fedfeb42bb07684d667da4