Merge "Skip transfer starting window from above if current activity has drawn." into udc-dev