Merge "Use non-root user in Dockerfile"