Merge "Update List positions for shortcuts and grid layout" into main