Merge "Fix default GridView list selector" into lmp-preview-dev