Merge remote-tracking branch 'origin/view-binding' into view-binding

# Conflicts:
#	src/main/java/com/owncloud/android/ui/fragment/ShareFileFragment.java