Follow Up Fix PR #36596 - Remove indents for returns (shorten the code/indent level on early return instead of if/else)

Follow Up Fix PR #36596 - Remove indents for returns (shorten the code/indent level on early return instead of if/else) #15541