Merge "Fixing empty page not removed when drag ends" into sc-dev