Merge "Remove SHELL UID permission check from overrideConfig"