Merge "Fix tap outside focus for SCVH from different process." into udc-dev