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

Change-Id: I8887f47b9647841a58d2399c699f0433ad1189c7