Merge "QS: Fix up non-dual target touches"