Merge "Fix crash with smartspace view reparenting" into sc-dev