Merge "Fix duplicate permission privilege escalation" into qt-dev