Merge "GridView attribute updates"