Merge "Fix NPE in PinnedTaskController" into sc-v2-dev