Merge "Remove popup container drag listener on close complete." into sc-v2-dev