Merge "Add mixed-handler for unfold and mix in pip state" into udc-dev