Merge "Enforcing the touchslop now when flinging open before intercepting" into mnc-dev