Merge remote-tracking branch 'origin/feature/live-photo' into feature/live-photo

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