Merge "Revert "Fix ClassCastException in QuickstepModelDelegate""