Merge "[DPP] Fix intent dispatching"