Merge "Fix 3290446: Reduce number of recents to fit in a single binder"