Merge "Have PopContainerWithArrow require BaseDraggingActivity." into sc-v2-dev