Merge "Fix folder icon drawable padding for responsive grid" into main