Merge "Dismiss recents after switching users" into oc-mr1-dev