Merge "Fix issue with both shell and launcher updating drag surface" into tm-qpr-dev