Merge "Fix clpf and dering signalling when used with ext-partition-types" into nextgenv2