Merge "Ensure null elements aren't added to TaskView shortcut list" into tm-qpr-dev