Merge "Remove SHELL UID permission check from overrideConfig" into qt-dev