Merge "Make sure stickies get resent from the same UID." into udc-dev