Merge "Fix 3386135: Make recent apps scrollable with more entries"