Merge "Ensure wm is fetched on the shell thread" into sc-qpr1-dev