Merge branch 'v1-nougat' of ssh://gitlab.e.foundation:2222/e/apps/eDrive into v1-nougat