Merge "Fix ClassCastException in QuickstepModelDelegate" into sc-v2-dev