Merge "Revert "Revert "Change position of isSdkSandbox{Audit,Next} inpu..."" into main