Merge "Migrate Dockerfile.portal to unprivileged user" into release-3.2.0