Merge "Add plugin to swap out recents" into oc-dr1-dev am: a69c03b6b1
am: 84510887b0

Change-Id: I5483d77315ae0db8c35e8535ea8e754908e3d235