Merge "Only allow app drags to go to global intercept windows" into sc-dev