Merge "Prevent NPE when pinning task from split screen" into sc-dev