Merge "Add plugin to swap out recents" into oc-dr1-dev