Merge "Some cleanup in RecentsView" into sc-dev