Merge "Handle USER_ALL DPM broadcast" into main