Merge "Fixes bug where app suggestions incorrectly calculate available space when bottom row is full" into main