Merge "Set idmap2 binary uid and gid after forking" into qt-dev