Merge "Force Grid-based Recents to show at most 8 tasks." into nyc-mr2-dev
am: b100a9ac58

Change-Id: I74d039468db01cf1018ab397b94f70b1d517432b