Merge remote-tracking branch 'origin/feature/new_grid-layout' into feature/new_grid-layout

# Conflicts:
#	app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
#	app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt