Merge "Add margins to top and bottom when grid only overview enabled" into main