MERGE fix MADSP subops in surface lowering