Merge "Fix race condition causing screenshot view to be added to window twice" into sc-qpr1-dev