Merge "Fixing dragView not getting removed on returning home" into sc-dev