Merge "Fix grid screen options (2/2)" into main