Merge "Fix NPE in FlingToDeleteHelper" into sc-dev