Merge "Load correct thumbnail size when switching to grid from list (and visa versa)."