Merge "GridLayoutManager: Fix WindowAlignment algorithm"